cssimage: Fallback images have no aspect ratio

The aspect ratio for fallback image was incorrectly set to 1.

Reftest is included.

diff --git a/gtk/gtkcssimagefallback.c b/gtk/gtkcssimagefallback.c
index 316f4223774251745aea6aac944b37b601c4e1fd..a1f74e6859846f3e803a2b5d8538038cf697eb3b 100644 (file)
--- a/gtk/gtkcssimagefallback.c
+++ b/gtk/gtkcssimagefallback.c
@@ -56,7 +56,7 @@ gtk_css_image_fallback_get_aspect_ratio (GtkCssImage *image)
   GtkCssImageFallback *fallback = GTK_CSS_IMAGE_FALLBACK (image);
 
   if (fallback->used < 0)
-    return 1;
+    return 0;
 
   return _gtk_css_image_get_aspect_ratio (fallback->images[fallback->used]);
 }

diff --git a/testsuite/reftests/Makefile.am b/testsuite/reftests/Makefile.am
index 31645d23f03791e266ee6d78bd88488d31b3a306..8644e1cdfb8474cf14e3cf658c8f170099f4d7a5 100644 (file)
--- a/testsuite/reftests/Makefile.am
+++ b/testsuite/reftests/Makefile.am
@@ -201,6 +201,9 @@ testdata = \
        css-image-aspect-ratio.css \
        css-image-aspect-ratio.ui \
        css-image-aspect-ratio.ref.ui \
+       css-image-color-aspect-ratio.css \
+       css-image-color-aspect-ratio.ui \
+       css-image-color-aspect-ratio.ref.ui \
        css-match-class.css \
        css-match-class.ref.ui \
        css-match-class.ui \

diff --git a/testsuite/reftests/css-image-color-aspect-ratio.css b/testsuite/reftests/css-image-color-aspect-ratio.css
new file mode 100644 (file)
index 0000000..6c83a76
--- /dev/null
+++ b/testsuite/reftests/css-image-color-aspect-ratio.css
@@ -0,0 +1,9 @@
+window {
+  background-color: blue;
+  background-image: image(red);
+  background-repeat: no-repeat;
+}
+
+#reference {
+  background: red;
+}

diff --git a/testsuite/reftests/css-image-color-aspect-ratio.ref.ui b/testsuite/reftests/css-image-color-aspect-ratio.ref.ui
new file mode 100644 (file)
index 0000000..982e3d8
--- /dev/null
+++ b/testsuite/reftests/css-image-color-aspect-ratio.ref.ui
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <!-- interface-requires gtk+ 3.0 -->
+  <object class="GtkWindow" id="window1">
+    <property name="width_request">20</property>
+    <property name="height_request">10</property>
+    <property name="can_focus">False</property>
+    <property name="type">popup</property>
+    <property name="name">reference</property>
+  </object>
+</interface>

diff --git a/testsuite/reftests/css-image-color-aspect-ratio.ui b/testsuite/reftests/css-image-color-aspect-ratio.ui
new file mode 100644 (file)
index 0000000..d264856
--- /dev/null
+++ b/testsuite/reftests/css-image-color-aspect-ratio.ui
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <!-- interface-requires gtk+ 3.0 -->
+  <object class="GtkWindow" id="window1">
+    <property name="width_request">20</property>
+    <property name="height_request">10</property>
+    <property name="can_focus">False</property>
+    <property name="type">popup</property>
+  </object>
+</interface>